merge edit-selection into master

This is ready for the next phase