Some more improvements (compilation NG)
More adaptations to the DB model (compiles, but does not run)
Improvements (partly working)
Moved stuff from sql model to ocondition
Some clean-up