Merge Mary's command line post 

This isn't ready to merge yet! I still have part 2 to do. :)