Add commandline output capability
Delete excess scratch code