WIP - Started command line handling