Changed CLI over to commander