Overhauled the Map class to prepare for new features. Fixed issue of hard coding map width and height (finally).