Fix class 17 and finish class 18