OOP update in progress
@phillycc @asoper29