Mostly refactored usage away from placeRoom functions
Finished refactoring (I think)
Disabled debug line, removed commented code.
Removed commented code
Updated TODO
Cleaned up map