started track M/C
started track M/C
Merge pull request #22 from cnd11/master

class rework