Initial angular working code