yes - I think this is what we'll start working on now