Updated some stuff, but about to change everything