Dev master

Adding in the rest of the polynomial work.