Added angular and basic functionality