More files and basic cApp stuff to read in command line