nav
Merge pull request #29 from nicintosh/master

this thing is starting to work