Wacky Done

Cleaned up and finished Wacky Conditionals