Added some potential promise implementation that doesnt neet a new client