Shapes added. Closes #1