#73 Finished stubbing in the API including todo comments.