Merge pull request #336 from BU-CS673/Brandon

Damageable Refactor