OK-ish handler handling plus better deferred init