Replaced CanJS with Angualar