Lots and lots of fixes. The big bundle project can almost build