Migration, optional, and some class fixes - still broken