Starting work on this again!

Ok, so I'm going to be working on this some more. I don't know where I
left off, so I'm just going to push whatever I've changed right now...