Feature/new group wizard

This feature needs some serious QA / testing / feedback.