Add in some MAJOR changes