Start making selection working again

this is WIP