Fill in shape framework; add example shapes; add test case