Let's put a bit of structure in this mess