Switch to Colt lib; finish implementation