One more experimental commit. Getting things working on the laptop.