New, simpler interface
Don't forget the other code
Refactor the fourup code