Natty integration

Closes #1606
Double checked this test works fine for me.