TODO are tickets now. Some refactoring