added command string handling and testing