diff --git a/nmap.py b/nmap.py
index 00bc6b4..a8e8b92 100644
--- a/nmap.py
+++ b/nmap.py
@@ -56,38 +56,44 @@ def cmd_list(oa_adder):
     elif menu_choice == "3": print "nmap -T4 -sX -iL ~/fping.txt %s" % oa_adder;os.system("nmap -T4 -sX -iL ~/fping.txt %s" % oa_adder)
     elif menu_choice == "4": print "masscan -p80 -iL ~/fping.txt";os.system("masscan -p80 -iL ~/fping.txt")
     else: print ""
+
+def choose_fping_func():
+    valid_choice="0"
+    while valid_choice=="0":
+            fping_creator = raw_input("Generate a target list with fping?[y/n]").lower()
+            if fping_creator=="y" or fping_creator=="yes": print "Starting fping";fping_txt();valid_choice="1"
+            elif fping_creator=="n" or fping_creator=="no": print "We will not be generating a target list with fping";valid_choice="1"
+            else: print "Enter a valid choice ('yes','y', 'n', 'no')"
+
+def choose_edit_txt():
+    valid_open="0"
+    while valid_open=="0":
+            open_fping = raw_input("Would you like to edit ~/fping.txt?[y/n]").lower()
+            if open_fping == "y" or open_fping=="yes": raw_input("Opening Vim\nPress [ENTER]");os.system("vim ~/fping.txt");valid_open="1"
+            elif open_fping == "n" or open_fping=="no": print "We won't edit ~/fping.txt";valid_open="1"
+            else: print "Enter valid choice ('yes', 'y', 'n', 'no')"
+
+def add_nmap_oa():
+    valid_oa="0"
+    while valid_oa=="0":
+            add_oa = raw_input("Do you want to add NMAP output file?[y/n]").lower()
+            if add_oa == "y" or add_oa=="yes": name_oa = raw_input("What do you want to name the output file?");valid_oa="1";add_oa_valid="1";oa_adder="-oA " + name_oa
+            elif add_oa == "n" or add_oa=="no": print "There will be no output file for NMAP";valid_oa="1"
+            else: print "Enter a valid choice ('yes', 'y', 'n', 'no')"
+
+
+
 ###
 #
 #Main body of script
 #
-###
+##
 
 print "Start of script..."
 
-
-#print "Generate a target list with fping? [y/n]"
-
-valid_choice="0"
-while valid_choice=="0":
-        fping_creator = raw_input("Generate a target list with fping?[y/n]").lower()
-        if fping_creator=="y" or fping_creator=="yes": print "Starting fping";fping_txt();valid_choice="1"
-        elif fping_creator=="n" or fping_creator=="no": print "We will not be generating a target list with fping";valid_choice="1"
-        else: print "Enter a valid choice ('yes','y', 'n', 'no')"
-
-valid_open="0"
-while valid_open=="0":
-        open_fping = raw_input("Would you like to edit ~/fping.txt?[y/n]").lower()
-        if open_fping == "y" or open_fping=="yes": raw_input("Opening Vim\nPress [ENTER]");os.system("vim ~/fping.txt");valid_open="1"
-        elif open_fping == "n" or open_fping=="no": print "We won't edit ~/fping.txt";valid_open="1"
-        else: print "Enter valid choice ('yes', 'y', 'n', 'no')"
-        
-valid_oa="0"
-while valid_oa=="0":
-        add_oa = raw_input("Do you want to add NMAP output file?[y/n]").lower()
-        if add_oa == "y" or add_oa=="yes": name_oa = raw_input("What do you want to name the output file?");valid_oa="1";add_oa_valid="1";oa_adder="-oA " + name_oa
-        elif add_oa == "n" or add_oa=="no": print "There will be no output file for NMAP";valid_oa="1"
-        else: print "Enter a valid choice ('yes', 'y', 'n', 'no')"
-
+choose_fping_func()
+choose_edit_txt()
+add_nmap_oa()
 menu()
 cmd_list(oa_adder)