Diner Diorama - Code Migration