Prep for full redesign
First pass at redesign