Design

Lacking Sebastian's converter, but overall finished (merging for Nancy)