Final changes before writing tests to guide development.