Charley's (probably) final update + new ocs