Implement CLI section - first draft