Start adding command line functionality