-*-iri-*- more OO, less args