Start rewrite to use AngularJs