Add Matt's outline to Makefile
Fix broken ref (from a duplicate)
Add abstract and trivial changes