Merged cloud and info work

Signed-off-by: Christoffer Johnsson <stoffe1992@hotmail.com>