Adding TCR functionality to command line version