I think it makes sense to let the interface drive these changes. Since it's still so much in flux I think we're better off waiting to see what Edwin cooks up.