Properly threaded now, but makes me want to kill something