First working version with animations