@Doggit Thanks, I'll see what needs to be done before continuing to work on it so we don't have to open up things later.
The biggest issue was (still is to some extent) the mansard bedroom where the cupboard is, trying to make some space there, we initially planned for taking the whole thing out...