Conversion layout mostly complete