Work in Progress

Need to think about how to do the async calls