Implementation now code-complete (no tests yet)