Rectangles and triangles done, going to start working on bonus