Fini!!

Kiri done...needs blocking...not coherent now.... more to follow after sleep...