Code all realigned, but that is it.

Didn't break anything up, update anything, just got it working again.