Second layer in, logic changed quite a lot. Extended still missing.