Quad

Merged Jared's changes with mine and added some more edits.