I think this is a reasonable first step. I agree with @twolfson that we could do some kind of generator long term.