Simpled model by combining Commentary and Issue into Feedback.
Removed the Issue and Commentary from the model and cascaded this change all the way through the code base.  Wish I had unit tests...