Tracer is now an ACTUAL library
Fixed merge conflict