refactoring the moster mash a bit so it can include client package information