WIP - StateTracer done