Adding presets
Tidying up
Merge branch 'feature/adding_presets'