Began adding extensive Angular functionality