Added some new classes and the track reading