starting to more add action handlers and rejig to common validation