Working through a live redesign..
Merge branch 'rewrite'