First pass at adding animation