Refactor tons, begin thread manager