Selection modification

Borked most things to do with selection. WIP