Move code around
Cleanup runCFA
Hhhhm
Fauly