I HAVE NOT SEEN YOU OTHER CLASSES AND FUNCTIONS BUT AS FAR AS I SAW YOUR LAST CLASS, I CORRECTED SOME STUFF THAT WILL GIVE YOU CORRECT RESULT.
THE OLD ONES ARE COMMENTED AND THE I HAVE ADDED THE...