Natty integration

Closes #1606