Added stuff to my 'test' class, to move to the client eventually, like
better GUI stuff