New build

Lots of spoilers added