botched merging from topic branch, updated current_group in init to @current_group
updated gem