Commit, almost ready for prototype test.