Sure did a lot of work in a short amount of time.  More commits next time, I swear.