Completed tracking database and new group tables
Completed tracking database and new group tables