Added local shape features, needs work