ugly
Merge https://github.com/williamhunt/cp