Changes to method of selecting binary and passing in options