100% threaded now, will be buggy, test tomorrow