Updated LocalShapesFeature, still working out bugs in it