Made the classes work