Major changes, shit is broken