start to get touchey-feeley with the framework (AKA change generated stuff around)