added more functionality to order and client