Just added some prints to trace - should replace with Trace objects