- Refactoring starting to work