Added angular cf in a basic way. Yet to be properly tested