Ctan class 2

My second commit! Slowly but surely (catching up).