Making it more useful, inplemented angularjs