Move options stuff
Merge branch 'gareth'
Merge branch 'zach'