Finished moving stuff with sine and cos, all repos up to date