Lots of work on the auto-workbench - few errors to iron out and a little clean up to do