Refactored a bit, added basic shapes (with specs)