Fixed an issue with duplicate entities

This candiate also adds movement for entities