Switched to using optionals instead of taking in a blank value