I think this, and 4/11, is a premature improvement at this point. It's easy to duplicate what you need right now and deal with it when important parts are settled.