Created class tracking system
Merged changes