After 5 long days, and a whole new repo, I have fixed my 1.8 issues :)