client server: Add awaiting functionality