Issue25richardapi

This is for #25