Er, fixed some things, didn't realize I had a few problems with the
code, right now, it's hanging, I'll look into it.
I suppose it's as good time as any to commit and push.