Some work on entity and ship stuff