Adds skeleton for reverse conversion (but no conversion)
Slightly better error detection and structure