Isolated trac parts. Simplifying before starting any dev work on it.