Switching to Angular 2