Natty integration

Closes #1606
Yes, incorporated (on the 1946 branch)