Merged updated Non-func section.

The latest R&a still had some of the old non-func requirements so I
merged the updated one.