Revert "API redo."

This reverts commit 06a8e42eddf435e4f3e0487e430e058bce35b716.
Whoops