Code from last testing session 

Hop, this is the code from the last testing session.
I cleaned it up a bit, but it's still a bit messy.