still not done with the stupid bugs