Reorganized some methods, improved approve and email calls

The existing email query strings should work now with at most some changes to names.
Approve can be called with just an ID now as well.