Added (commented) command line mappings - there is still some work to do