Trying to incorporate OOP rather than just straight up procedural programming.