Pretty much, though you forgot an array. You can actually just do exactly what I suggested in the first screenshot of #639.