UGH! Failed on 1.8.7 due to syntax inconsistencies. I'll have to fix that tomorrow - sorry to leave it hanging.