Add cli implementation
Add signatures to help compiler
Inline local definition