Reposition entities
Add TODOs