Refactor Commit 1 Not completed.