Migrating to a class - WIP