Remove TODOs
Add entities on the right side too