Changes to help make the application more aimed towards OOP, more shall come.