Seperated Entities and TileEffects.
Removed a todo.