Under construction

Fixing things, come later.