debugging
Restored 'Option', moved some code into editor folds
Cleanup
more cleaning
Merge branch 'master' of github.com:kurki13/kurki13 into refactor_test
Merge branch 'master' of github.com:kurki13/kurki13