FERMI refactor

In progress.