 (defui PokeTableEntry
   Object
   (render [this]
-    (let [pokemon (om/props this)]
+    (let [pokemon (om/props this)
+          move-1 (moves/get-move (:move_1 pokemon))
+          move-2 (moves/get-move (:move_2 pokemon))]
       (dom/tr #js {:id              (str "poketable-row-" (:id pokemon))
                    :className       "poketable-row"
                    :data-favorite   (:favorite pokemon)

              (dom/td nil (favorite-td (:id pokemon) (:favorite pokemon)))
              (dom/td nil (:pokemon_id pokemon))
              (dom/td nil (dom/img #js {:src (str "img/pokemon/models/" (:pokemon_id pokemon) ".png") :className "pokemon-image-thumb"}))
              (dom/td nil (:name pokemon))
              (dom/td nil (:nickname pokemon))
              (dom/td nil (moves/get-name (:move_1 pokemon)))
              (dom/td nil (moves/get-name (:move_2 pokemon)))
              (dom/td nil (:cp pokemon))
              (dom/td nil (:individual_percentage pokemon))
              (dom/td nil (:individual_attack pokemon))

                                           (vlib/sortable-table-header :pokemon_id "#")
                                           (dom/th nil "")
                                           (vlib/sortable-table-header :name "Name")
                                           (vlib/sortable-table-header :move_1 "Fast")
                                           (vlib/sortable-table-header :move_2 "Special")
                                           (vlib/sortable-table-header :cp "CP")
                                           (vlib/sortable-table-header :individual_percentage "IV%")
                                           (vlib/sortable-table-header :individual_attack "AT")
                                           (vlib/sortable-table-header :individual_defense "DF")
                                           (vlib/sortable-table-header :individual_stamina "ST")
                                           (dom/th nil "")))
                        (dom/tbody nil
                                   (interleave
