Started bringing everything togeather into the Tracer class