Start of map parser
Fix conflict
Implemented map parser