Repair Workshop Model attachments

Back and forth figuring out the proper attachments to other models for article queries.

I think this is correct now.