added tons of angular stuff