Added initial framework for conditionals