Tweaking some of the packages.
Adding some templating to the angular stuff