Revert "Revert "Feature/cmdline options""

This reverts commit 3dd22822aafbc0caa480a041f7b93c4110c8c490.