Made a version using classes

Clock6=classes, clock5=only defs.