Massive changes holy heck