Starting CFD, bunch of refactorings
Refactored state parsing into a class