starting to use angular for this