Intermediate commit

Worked on paragraph about magic template... feel free to look over edits
but it's nothing major