Adding two classes (forgot to push earlier)