fixed animiations and moved angular code into models.