calling this v1,  going to refactor with angular