Much more shit changed

A lot