Updated the TODOs, setting the tracepoint is (mostly) resolved