sure, I'd do it along moving this all to executor in #50 or one step before, I'll create an issue for that.