Added delivery address functionality

Remove comments