Continued work on Map functionality, plus rearranging Room.java. Nothing is fully implemented. Bedtime commit.