66970134 api

References: https://www.pivotaltracker.com/story/show/66953872 and https://www.pivotaltracker.com/story/show/66970134