Initial implementation of OER feature
merging v4