D7 is a cold neutron multidetector diffractometer with full XYZ polarisation analysis.  This allows the unambiguous separation of nuclear, magnetic and nuclear-spin-incoherent scattering contributions simultaneously over a large range of scattering vector Q, and is therefore ideal in the study of diffuse scattering from disordered magnetic materials.   The addition of a neutron Fermi chopper, transforms D7 into a time-focusing time-of-flight spectrometer with polarisation analysis. The current set-up allows polarisation analysis with an incident energy of E_i ~ 3meV. An evacuated flightchamber, between the sample and analysers, will shortly be implemented enabling us to separate magnetic from nuclear excitations with an incident energy of  E_i ~ 9meV.