I'll merge these but don't depend on them, I'll break them at some indeterminate point in the future :)