More Class stuff

Signed-off-by: unknown <s-mberger@487M009546.lwsd.k12wa.org>