WIP on fixing the mapData serialization issue.
More mapData WIP.