Alex/design

I want to pull this before. I think there will be fewer merge conflicts.