added shelter as an argument to option methods to make it not a global variable