Too many updates to describe.

TODO: Commit often!