Started moving to class notation (since it's less gross looking)