added angular & moved stuff around