Almost finished with refactor