Moved track class for #8