Work in progress. Start towards using tracepoint. For now we, need to simplify whereever possible.