Refactor progress..