Almost done

I'm doing a bit of restructuring back here. I'll be done shortly.