Started working on making the trace system more powerful and nice to use
Merge branch 'newsrc' into trace-overhaul