it's hard to keep such massive changes in sync with the tree so I need to get it in and work from there now). Jan
