massive changes
added angular