Adds some new features but breaks old stuff, sorry