#38 Now ignores subtracks

Handles subtracks