Combination track

Combination track branch pull requested for code review purposes, as requested by @rbuels