Almost done! - fixed entities, for now. No entity loader.