trackhubs refactored