Added some basic tracing code
Code we used for the first demo