Initial addition of Mac's work so far