CLI now uses resolver and cli logging fixed