WIP
Bug fix. Need to remove selections when we're done