Updated with initial API thoughts