security commit, need to chop up animate()