I believe that the class may very well be finished with this commit