i think it gets much, much easier to do when we're not doing resolves in the critical path anymore