JLF-17: Moved states used for CFD out into config file.  We still have a separate ongoing states.  Might want to merge these into the list of states at some point