Debugging pt2

It didn't sync everything so here's the rest