More work toward moving functionality to new OOP design