Added remaining functional requirements. Added spot for non-functional requirements below the functionals.