complete rework to allow addition of more animations