Final commit.

This is the final commit. If another commit comes in later on, it'll be for bug fixes
only.