MUST CLEAN UP ALL THE THINGS!

Dubbz and myself had a test run earlier tonight and most stuff looked ok
except for a bunch of edge cases which I wanted to wait with fixing
until later ... guess later was now