Making progress on angular rewrite