Calculator updated with command line working