Preparing redesign

pushit