For Version 1.2

Finished new version of Step 1. Extensive testing still needs to be
done to verify it works.
All options are now in their own hidden categories.