Some refactoring and dealing with a test I consider should pass eventually while I work on this.