Refactor in progress..