Revert last commit, added new entity prototype