cmstrickland/pconch 6 commits