Shapes added, new branch