Finished API refactoring. Ending work on unstable branch for incrementally dragging functionality to the stable branch while extending test coverage.