Work on angular implementation