diff --git a/src/main.c b/src/main.c
index 2be36c4..d75ec84 100644
--- a/src/main.c
+++ b/src/main.c
@@ -5,14 +5,15 @@ pksav_gen2_save_t loadSaveFromFile(char *path, pksav_error_t err)
 {
     bool is_gen2 = false;
     err = pksav_file_is_gen2_save(path, true, &is_gen2);
-    if (!is_gen2) {
+    if (!is_gen2)
+    {
         printf("Save is not a Gen 2 save file!\n");
     }
     if (err != PKSAV_ERROR_NONE)
     {
         printf("Error checking save: %s\n", pksav_strerror(err));
     }
-    
+
     pksav_gen2_save_t save;
     err = pksav_gen2_save_load(path, &save);
     if (err != PKSAV_ERROR_NONE)
@@ -21,7 +22,6 @@ pksav_gen2_save_t loadSaveFromFile(char *path, pksav_error_t err)
     }
     return save;
 }
-
 void printTrainerData(pksav_gen2_save_t *save)
 {
     // Trainer name
@@ -33,16 +33,15 @@ void printTrainerData(pksav_gen2_save_t *save)
     uint16_t trainer_id = pksav_bigendian16(*save->trainer_id);
     printf("Player ID: %u\n", trainer_id);
 
-    // Trainer Money
-    uint32_t money = 0;
-    pksav_from_bcd(save->money, 3, &money);
-    printf("Player money: %u\n", money);
+    // // Trainer Money
+    // uint32_t money = 0;
+    // pksav_from_bcd(save->money, 3, &money);
+    // printf("Player money: %u\n", money);
 
-    // Time played
-    pksav_gen2_time_t timePlayed = *save->time_played;
-    printf("Time played: %d:%2d:%2d\n", timePlayed.hours, timePlayed.minutes, timePlayed.seconds);
+    // // Time played
+    // pksav_gen2_time_t timePlayed = *save->time_played;
+    // printf("Time played: %d:%2d:%2d\n", timePlayed.hours, timePlayed.minutes, timePlayed.seconds);
 }
-
 void changePartyPokemonNicknameAtIndex(pksav_gen2_save_t *save, int pokemon_index, char *new_name)
 {
     char pokemon_name[11];
@@ -50,17 +49,63 @@ void changePartyPokemonNicknameAtIndex(pksav_gen2_save_t *save, int pokemon_inde
     pksav_text_from_gen2(save->pokemon_party->nicknames[pokemon_index], pokemon_name, 10);
     printf("Pokemon new name: %s\n", pokemon_name);
 }
-
 void saveToFile(pksav_gen2_save_t *save, char *path, pksav_error_t err)
 {
     pksav_gen2_save_save(path, save);
     pksav_gen2_save_free(save);
 }
+void printPartySpeciesAtIndex(pksav_gen2_save_t *save, int pokemon_index)
+{
+    uint8_t species = save->pokemon_party->party[pokemon_index].pc.species;
+    printf("Pokemon species: %u\n", species);
+}
+void printPartyPokemonAtIndex(pksav_gen2_save_t *save, int pokemon_index)
+{
+    // print nickname
+    char pokemon_nickname[11];
+    pksav_text_from_gen2(save->pokemon_party->nicknames[pokemon_index], pokemon_nickname, 10);
+    printf("Pokemon nickname: %s\n", pokemon_nickname);
+}
+void printParty(pksav_gen2_save_t *save)
+{
+    for (int i = 0; i < 6; i++)
+    {
+        printPartyPokemonAtIndex(save, i);
+    }
+}
+void swapPartyPokemonAtIndices(pksav_gen2_save_t *save, int pokemon_index1, int pokemon_index2)
+{
+    // swap nickname
+    // char tmp_nickname1[10];
+    // char tmp_nickname2[10];
+    // pksav_text_from_gen2(save->pokemon_party->nicknames[pokemon_index1], tmp_nickname1, 10);
+    // pksav_text_from_gen2(save->pokemon_party->nicknames[pokemon_index2], tmp_nickname2, 10);
+    // pksav_text_to_gen2(tmp_nickname2, save->pokemon_party->nicknames[pokemon_index1], 10);
+    // pksav_text_to_gen2(tmp_nickname1, save->pokemon_party->nicknames[pokemon_index2], 10);  
+
+    // swap party
+    pksav_gen2_party_pokemon_t tmp_pokemon = save->pokemon_party->party[pokemon_index1];
+    save->pokemon_party->party[pokemon_index1] = save->pokemon_party->party[pokemon_index2];
+    save->pokemon_party->party[pokemon_index2] = tmp_pokemon;
+
+    // swap species
+    uint8_t tmp_species = save->pokemon_party->species[pokemon_index1];
+    save->pokemon_party->species[pokemon_index1] = save->pokemon_party->species[pokemon_index2];
+    save->pokemon_party->species[pokemon_index2] = tmp_species;
+
+    // swap otnames
+    // char tmp_otname1[8];
+    // char tmp_otname2[8];
+    // pksav_text_from_gen2(save->pokemon_party->otnames[pokemon_index1], tmp_otname1, 7);
+    // pksav_text_from_gen2(save->pokemon_party->otnames[pokemon_index2], tmp_otname2, 7);
+    // pksav_text_to_gen2(tmp_otname2, save->pokemon_party->otnames[pokemon_index1], 7);
+    // pksav_text_to_gen2(tmp_otname1, save->pokemon_party->otnames[pokemon_index2], 7);  
+}
 
 int main()
 {
     pksav_error_t err = PKSAV_ERROR_NONE;
-    pksav_gen2_save_t save = loadSaveFromFile("../rom/pk-crystal.sav", err);
+    pksav_gen2_save_t save = loadSaveFromFile("../saves/crystal.gbc.sav", err);
     if (err != PKSAV_ERROR_NONE)
     {
         printf("Error loading save: %s\n", pksav_strerror(err));
@@ -68,8 +113,15 @@ int main()
     }
     printTrainerData(&save);
 
+    printParty(&save);
+
+    swapPartyPokemonAtIndices(&save, 0, 1);
+
+    printParty(&save);
+
+
     // Update 1st party pokemon name
-    changePartyPokemonNicknameAtIndex(&save, 0, "Pikachu");
+    // changePartyPokemonNicknameAtIndex(&save, 0, "GYARADOS");
 
     saveToFile(&save, "../rom/pk-crystal.sav", err);
     if (err != PKSAV_ERROR_NONE)