Nutnr dev - completed code review, ready for merge