Random goodness
Testing stuff, cleanups... and I'm too tired to be coding
Tests