break out options into options object so passing is easier