Model 2 almost done

It is almost done, all internal steps just like before on model 1 :-)