Pro version prep - so far checkboxes interface is done