lots of work on OAI, and touched areas