Commit updates not tested. Create osmodel as simplified, client facing
version of model.