Work in progress, some test succes, lots of cleaning to do.