modified ability to pass options to functions, less passing of args around