cleaning things up
working on making everything available from command line
command line set up and good to go