WIP on porting new delivery page