Migrated draw to base, prepared unique naming, etc