BROKEN -- need to get rid of nullpointer exception

changed many vectors to maps -- better that way