Partial commit before merge with master, master map still broken