Final commit for conditionals wacky

final commit