Functionality now complete - need to update proposed API.md to reflect
actual code