Addressed feedback from #48, Attached interdiff with 47, please review