Add CLI interaction
Refactoring and testing Form