Feature/version3x

All the 3.2 options other than monitors.