v2

@troygoode CR please.  Thanks!
Perhaps an `options` hash would make sense here?