Added Cli and encapsulation
Added test
Finished tests
Fixed everything