Refactor and Implement.