Changed fields to reflect db tables. Made only tracks required.
added comments for implimentation