Making use of angular templates WIP #60