Final commit before major changes.