Fixes to the class and new file with script requiring class.