LixCoO2 is used extensively in portable batteries in laptops and mobile phones, but the scarcity of Li means that alternative materials are required. Structurally related NaxCoO2 has excellent electrochemical performance, and greater stability than its Li analogue. Our neutron Laue diffraction measurements on SXD on a large single crystal of Na0.8CoO2 reveal fully ordered stripes of tri-vacancy clusters at low temperature that transform to a partially ordered structure at T=280K, and to a disordered phase at T=370K. Our QENS study using LET demonstrated energy broadening of the incoherent scattering from Na at elevated temperature. However, the absence of collimation gave a problematic background, and the Q range was insufficient for a full comparison with model calculations. We now propose to study Na diffusion by QENS using OSIRIS, which is ideally matched to this system.