#164: More clickatell model work