Steps refactored, not impl comments added