Latest rebuild broken

Yes I was hoping it wouldnt cause too much issues , but yes probably. It’s multiple commits though.