WIP: minor refactoring and addition of two more request methods.