More work on switching over to Angular