Start on cfs work - add config stuff