Fairly comprehensive set of angular functionality, minus completion of graph render and behaviour/state polish.

On branch master