working on form changes
fix groupings