HUGE update with the basics of tracking the data in seperate collections