redesigned some things poorly
Merge branch 'design'