putting this all together with angular