Added so much, not worth a comment. We're restructuring the code...
Merge branch 'Tiles'