organize vader move params
add ordered map- still broken though