Do you still want to move name into the options hash? I think that'd be good.