Moar APIs

Because @pikesley got merge happy :smile: