Lots of changes

Notning new though really. Just steps on the path to changing over
to the behaviour system.

Give me a couple of weeks and I'll be back exactly where I already
was :D