Changes on the way to new model

These are still unfinished but they are closer to the direction I want
to take.