More fixes
Work on the API
Commit all the overnight things.