R&A - Non-func requirements

I made a lot of assumptions here so raise any issues found.