More work on entities, still bugs with player movement at least