Implements some of #16 requests