more working, not sure if i hav the time to entirly fix