Add Include generation, Begin CLI interface