Begun adding content conditionals