Switched from module back to class...