[WIP] Allow choosing delivery method