First running prototype
Some more model adjustments