First pass OOP tasks

nicxvanrequested to merge
issue/drupal-3623380:3623380-create-oop-version into main

Closes #3623380

Merge request reports