more parse, starting to work on main map