Looking at formatting
Better help formatting unrefactored
Pull out the classes for formatting
Better conflicts support

Validations and actions handled similarly to options now