Feature/85 pickup dumb command