....

initial fully working