Pretty much... The code is in place. Still more work to do. But it has a lot of hooks and variables in other code, so commit and merge before I pick up a million 'Conflicts'.