update to angularizing this