Finished adding stuff
Made the other classes work