Changed some stuff. Almost working