Almost finished approvals (need a hash-related fix and some refactoring)

Didn't have access to that repo of yours, here's a pull request.