Tons of debug, changed most things