Switch positions of options.
First commit. Class structure mostly done. Need to check best way to get messages related to enum values.