My bad, 2 times the wrong file and 1 file missing ...
Added them and it should be fine for now.
Also noticed that the current Repo version will throw a error if you just copy this over, its about the IRepairable interface, I guess it is in one of the files I am currently overwriting (thats why I dont really like to do core changes for this)
Be aware of this, for now, and make sure you merge the Interface into the addon files.