Still working

… about to revert to earlier commit.