More pinmap work (very much WIP)