refactor complete, prep merge chris