Trace

Still requires a few fixes, but the main part is done.
Done.