hmmmh, tests sorely missing, must finish expectation plugin...