system re-structure.. cleaning to follow