Work in progress on a simpler api