Introduce more of our api basics.
Rollback a small change with setup.py