Polymorphic Comments, significant refactoring, and test structuring (not yet completed)
Polymorphic Comments Cleanup