Init redesign

The redesign isn't complete yet, but I'm sending in an early PR so we don't have to deal with resolving conflicts for too many files later. 

I'll try to complete the entire by this weekend!