changing it so everything sits under a group