cp_cmd refactoring
This doesn't truly Fixes #23 but I just kept that issue opened until I'd add this flag