Natty integration

Closes #1606
Thanks, done.