Refactored option caller so that it is being passed an option rather than getting the option itself. Did not make sense...