Made some more progress on ex35_map