Cleaned up Room
Added new code to ClassicRoom
Changed map to ClassicRoom