Added generic typing to Promises to handle typed data in the then statements... still issue with array