Related to #111. Added animation back in.