v2 implementation!

Fixes #143.

Obv. still a WIP. =)