Feature/track activation

Tests constitute a majority of the line diff. Actual code change is small, with most lines being comments added.