Threading slightly redone, testing.