Add opportunity to get resources via cli
Cleanup get_resources implementation
Merge branch cli