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

class rework