Added basic shapes, removed old code