Reorganize a few things. I THINK I like this...