Feature/angular/comment on alternatives