Fix bug. Add basic animation