#32 was created to merge the current state of PoC work from #17, which also included changes from #8. Feedback from #8 still needs to be reviewed and addressed.