Starting over with Angular generator instead