Progress towards ruins identifiers

Attempting new idea after this commit