More work on adapters and portable classes