Started refactor to threaded request system