Kenneth

Merge for refactor.