Merge of Andy Pages

This (hopefully) is my merge of my pages.