Small changes to get rid of certain errors.
But the class doesn't do what it should.
I'm working on it in a local project
and the class will be replaced if this works.