Angular

@ethanspiro - Pair clean up.  Please approve.