Stubbed endpoints for api
Merged from master