Getting somewhere, bunch of extra hacking after EmacsBerlin demo