Looks like Mark is working both ways. Need tests