Trying Adi's ideas

Learning from Adi's commits, so far just checking out, might take those
off later on.