Commented out command-fifo related stuff so it can run stand alone