Incident API additions

Resolutions for #111 and #113