Continue work on #200 ; integrate with Johann's work
Continue work on #200 Taxes management