Change lab 4 to not use classes