More work on entity refactor. Almost done :)