melee done

ranged and melee in