Merged Editor class into the previously underused Map class.