Derek branch

Adding bunch of commits to add group table.