Starting to class-ify the project