Mr. Dewey continues to refactor and implement