V2

Submitting for discussion, not ready to merge yet obviously