Commit before doing some reverts.
More work on behaviours