Re-organised to be more Angular focussed