Natty integration

Closes #1606
Yes, fixed!