applied model changes, compile errors resolved. TODO fix unittests
in between status