Update May 21

More and more code that works better and other that works less…. work
in progress…