Refactor 1 in progress