CLI ping almost working
Merge conflict fixed