WIP: haiku commits