Prep work for bunding this project with Cobra

This repo will be going away soon once this code is bundled with Cobra
itself.