drag n drop works pretty good now