Added Shapes and Edited Code