Added most of the requests in #28