Progress. This now works for Pokemon and Move