In process of adding animation toggling