Added 'group' functionality, needs work