Started redoing stuff using threads