command line support, and various refactorizations
command line works
command line works
test
Revert "test"

This reverts commit 7de671c4797e7b5d0202ddb18efc891f6f2cd029.
changed parsing format