OGM-414

@DavideD, @emmanuelbernard: This is not ready yet, but can you give me quick feedback on a specific question (see in-line comment below).