Tidy API
Begins to add sharing