New design

This isn't ready to be merged yet, but any comments/feedback/suggestions are welcome.