Developing the Client Side - Refactoring to Async/Await