More api brainstorming, api starting to work.