Huge refactoring, WIP 13, new tag computation
Huge refactoring, WIP 14 - 3 tests failing
End of refactoring