Final changes for this branch. Starting over again.