En picks/editor changes

Lets land this ASAP and keep picking other stuff.