Switched tiles to objects
Some notes and removed unused code