code changes to maps, should work??
One final bug with unpacking.. then I think basic maps should work