More LIDO work

Still to finish