add original ofer1 stuff, mainly the mock features and using them