Should be done at the same time as making it able to 'pull out' windows from the core frame at will. People that gotten used to a separated window should not be forced to have it back in the core, even if it is just for a while.