Added some initial trace stuff