Major milestone, all tests passes.
Thank a lot to Andrew Swan for the severe bugfix