started adding logic to support animation conditionals