Much refactoring: Andreas can use a working model now