Convert to class and instance of class
More WIP restructuring