finished angular draft