New OModel classes. with many TODOs...