Commit for access. Refactoring not yet complete.