Added cloud code
Added TODO