7 tested/rewritten
Q8 tested, on to set 2