reorganizing stuff, adding some initial map things