Moved methods around to organize and started working on more efficient map rendering