Finally got the ctrlp stuff under control (I think)