Great, and remove TODO comments :) Then I'll merge it.