Animation implemented but not working correctly yet