Migrating two more classes to oop.