Another interim commit, some things did not add last time.
Merge branch 'EntityLoader' into develop