OOP initial commit with new traces.