Lots of work on Entity
Starting work on loading and rendering