mostly done redesign