cecbccc3 — Jonni Liljamo refactor: move more to handlers 1 year, 3 months ago