Primary Building popup complete. Test tab working fine. Migration to actual tab and starting on Factory next.