Map class refactor; separate fn to load from tmx