merged group additions, seems feature complete!  Removed all grammer conflicts!