add first pass at oag integration