More work on drag command