new image naming convention
altered model to handle new shape type, minor changes