Developing, more test, developing, refactoring