Initial work on adding group/multi omi