add conditionals and lists