Added starter toa class
Merge branch 'scott'