Initial import of generateDS 2.12a