Added preliminary Angular functionality