Step 1 of refactor