Angular js

Continueing on master.