reviewed, little cleanup and 1 question. Should write a test for it
reviewed, little cleanup and 1 question. Should write a test for it

ZeroCM/zcm,ZeroCM/zcm,ZeroCM/zcm,ZeroCM/zcm,ZeroCM/zcm,ZeroCM/zcm