Part 2 nearly done (trigonometrics still missing)