First attempt of new model. Not yet working.