This is the result of merging errors

This compiles and boots but lots of errors need to be looked now !