Integrate Angular step 2

build on last commit