add a map, break some stuff
functionality and some other stuff