Test
Test2
Merge branch 'Test2'
Improved CLI. Re-Building some parts of it.