Fixed some deadlock stuff, Seems to be working now!
Missing just testing