OK. Squash the 3 commits and I'll merge the feature as-is. We'll improve it down the road.