Track logic, misc improvements to trace

Track logic (in progress), misc improvements to trace, reference previousEvent breadcrumb logic in Actions where Event>Resource logic exists.