Copy from old repo + start of angular impl