Lots of changes, but I need to fix a weird bug so I'm committing now.
Grrrr - probs with the animation stuff. Fudge.: