Adding CLI
Refactoring
Fixin engines array