Working on getting our trig right
Merge branch 'AI'