Added structure to finish order functionality