updated how I'll be handling conditionals