Revert "Revert "Added Collision Groups""

This reverts commit 357cd9d5c4aceb70eebb2a90183a528c40e4faac.