Got a lot of the APIs mapped.
Merge branch 'development'