Moving things over from angular