New Design

Closes #4