Is this ready for merge, @h2non?