Things...

Basically, rewrite most of it