extract shapes a bit in preparate for more complexity