Many changes, nearing completion, working on thread interaction now