Jason review

nice work - made some comments on reducing duplication but overall this looks good

let me know if my comments are unclear