Add some skeleton code for Shape stuff