Remote commit. Added entities. Still not final