good progress man
need to respond depending on format
thanks seb
removed caca
resolved conflicts