Finished migrating to angular

(hopefully)