Working on cloud end. Not fully working yet