New OOP architecture coming along.