Conditionals wacky

Update almost done on wack