Final updates for the API, now compiles.

@Afforess , you have your TODO as requested.
Signed-off-by: Chris Sanders <zidane@outlook.com>