Before Work Commit.

Last changes I made before work. (Resume around 8-ish).