class 8 Done - class 7 almost