Updated Class Files - Fixing Bugs
Updated Class Files - Part 2