Added basic tracing hooks
todo notes