New threaded and somewhat working