Steve/feature/shape import