Okay shit works now deprecating some stuff