cecbccc3 — Jonni Liljamo refactor: move more to handlers 11 months ago