Stash work from workstation...
... broken tests but progress.