Add more classes, haven't added functionality yet