diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index 763112798db..74be360759d 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -324,7 +324,7 @@ var/list/preferences_datums = list()
 
 					dat += "</td>"
 
-				if("wings" in pref_species.mutant_bodyparts)	//TODO: make specific body parts be toggleable via config or something.
+				if("wings" in pref_species.mutant_bodyparts && r_wings_list.len >1)
 					dat += "<td valign='top' width='7%'>"
 
 					dat += "<h3>Wings</h3>"
diff --git a/code/modules/mob/living/carbon/human/human_movement.dm b/code/modules/mob/living/carbon/human/human_movement.dm
index f1a749e2c1c..0bc87b8520a 100644
--- a/code/modules/mob/living/carbon/human/human_movement.dm
+++ b/code/modules/mob/living/carbon/human/human_movement.dm
@@ -22,7 +22,7 @@
 			. = 1
 
 /mob/living/carbon/human/mob_negates_gravity()
-	return shoes && shoes.negates_gravity()
+	return ((shoes && shoes.negates_gravity()) || dna.species.negates_gravity())
 
 /mob/living/carbon/human/Move(NewLoc, direct)
 	. = ..()
@@ -54,9 +54,8 @@
 
 				S.step_action()
 
-/*
+
 /mob/living/carbon/human/Process_Spacemove(movement_dir = 0) //Temporary laziness thing. Will change to handles by species reee.
-	..()
-	if(dna && dna.species.id == "angel" && dna.species.flying)
+	if(..())
 		return 1
-*/
\ No newline at end of file
+	return dna.species.space_move()
diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm
index 3ebb16dfbca..bd62732800f 100644
--- a/code/modules/mob/living/carbon/human/species.dm
+++ b/code/modules/mob/living/carbon/human/species.dm
@@ -1398,9 +1398,15 @@
 	. = stunmod * amount
 
 
+//////////////
+//Space Move//
+//////////////
 
+/datum/species/proc/space_move()
+	return 0
 
-
+/datum/species/proc/negates_gravity()
+	return 0
 
 
 
diff --git a/code/modules/mob/living/carbon/human/species_types.dm b/code/modules/mob/living/carbon/human/species_types.dm
index c57052b29ae..771b2f49580 100644
--- a/code/modules/mob/living/carbon/human/species_types.dm
+++ b/code/modules/mob/living/carbon/human/species_types.dm
@@ -749,6 +749,7 @@ SYNDICATE BLACK OPS
 	default_features = list("mcolor" = "FFF", "tail_human" = "None", "ears" = "None", "wings" = "Angel")
 	use_skintones = 1
 	flying = 0
+	blacklisted = 1
 	skinned_type = /obj/item/stack/sheet/animalhide/human
 
 	var/datum/action/innate/flight/fly
@@ -787,7 +788,7 @@ SYNDICATE BLACK OPS
 	if(H.dna && H.dna.species &&((H.dna.features["wings"] != "Angel") && ("wings" in H.dna.species.mutant_bodyparts)))
 		H.dna.features["wings"] = "Angel"
 		H.update_body()
-	if(ishuman(H))
+	if(ishuman(H)&& !fly)
 		fly = new
 		fly.Grant(H)
 
@@ -795,49 +796,58 @@ SYNDICATE BLACK OPS
 /datum/species/angel/on_species_loss(mob/living/carbon/human/H)
 	if(fly)
 		fly.Remove(H)
+	flying = 0
+	ToggleFlight(H,0)
+	if(H.dna && H.dna.species &&((H.dna.features["wings"] != "None") && ("wings" in H.dna.species.mutant_bodyparts)))
+		H.dna.features["wings"] = "None"
+		H.update_body()
 	..()
 
 /datum/species/angel/spec_life(mob/living/carbon/human/H)
-	..()
 	HandleFlight(H)
 
-
-
-
-
 /datum/species/angel/proc/HandleFlight(mob/living/carbon/human/H)
 	if(flying)
-		var/turf/T = get_turf(src)
-		if(!T) // No more runtimes from being stuck in nullspace.
-			return 0
-
-		var/datum/gas_mixture/environment = T.return_air()
-		if(environment && !(environment.return_pressure() > 30))
-			flying = 0
-			stunmod = 1
+		if(!CanFly(H))
+			ToggleFlight(H,0)
 			H.float(0)
-			return
+			return 0
 		H.float(1)
+		return 1
 	else
 		H.float(0)
+		return 0
 
 
+
+/datum/species/angel/proc/CanFly(mob/living/carbon/human/H)
+	var/turf/T = get_turf(H)
+	if(!T)
+		return 0
+
+	var/datum/gas_mixture/environment = T.return_air()
+	if(environment && !(environment.return_pressure() > 30))
+		return 0
+	else
+		return 1
+
 /datum/action/innate/flight
 	name = "Toggle Flight"
-	check_flags = AB_CHECK_CONSCIOUS
+	check_flags = AB_CHECK_CONSCIOUS|AB_CHECK_RESTRAINED|AB_CHECK_STUNNED|AB_CHECK_LYING
 	button_icon_state = "slimesplit"
 	background_icon_state = "bg_alien"
 
 /datum/action/innate/flight/Activate()
 	var/mob/living/carbon/human/H = owner
 	var/datum/species/angel/A = H.dna.species
-	A.flying = !A.flying
-	if(A.flying)
-		H << "<span class='notice'>You beat your wings and begin to hover gently above the ground...</span>"
-		A.stunmod = 2
-	else
-		H << "<span class='notice'>You settle gently back onto the ground...</span>"
-		A.stunmod = 1
+	if(A.CanFly(H))
+		A.flying = !A.flying
+		if(A.flying)
+			H << "<span class='notice'>You beat your wings and begin to hover gently above the ground...</span>"
+			A.ToggleFlight(H,A.flying)
+		else
+			H << "<span class='notice'>You settle gently back onto the ground...</span>"
+			A.ToggleFlight(H,A.flying)
 
 
 /datum/species/angel/proc/flyslip(mob/living/carbon/human/H)
@@ -869,4 +879,25 @@ SYNDICATE BLACK OPS
 /datum/species/angel/spec_stun(mob/living/carbon/human/H,amount)
 	if(flying)
 		flyslip(H)
-	..()
\ No newline at end of file
+		ToggleFlight(H,0)
+	..()
+
+/datum/species/angel/negates_gravity()
+	return flying
+
+/datum/species/angel/space_move()
+	return flying
+
+/datum/species/angel/proc/ToggleFlight(mob/living/carbon/human/H,flight)
+	if(flight)
+		flying = 1
+		stunmod = 2
+		speedmod = -1
+		H.pass_flags |= PASSTABLE
+		H.OpenWings()
+	else
+		flying = 0
+		stunmod = 1
+		speedmod = 0
+		H.pass_flags &= ~PASSTABLE
+		H.CloseWings()
\ No newline at end of file