Further work

....under construction...