Second commit, still having issue with angular