Last changes before moving the asshole model into the designer

Forgot to commit my previous Monticello commit, hopefully this does not
cause problems
I HATE THIS
About halfway done with #33 - will require testing