Refactor still in progress