Threading implemented, testing in progress