Add handler. Without tests (Experiment driven code)