Trace!

[Ryan]

Now this is looking good. Fixes a couple things and improves moving to the tracing player.

https://mega.nz/file/X4wy1KZJ#2NqSg0ItzfEhz71-b55PyqqR1xmOHtk3R-GdVD0Bh30