Got default values to work but having issues with getting passed in values to stay