Solution seems to work. Need to change return type and document. Also add time out if avaliable.