Added Shapes, Import, etc.

Need to comment more