F&U code reformatted.
Adaptation of the Filtering and Updating step.
Still missing a good chunk of the unit tests.