Still refactoring ugly things