Implement new design

Probably the best thing to do when reviewing this is just pull down the new changes and try everything out.