More work to do for sure, but Entity loading is finally here.
Merge update. See previous commit.