Move options stuff
Merge branch 'gareth'