Arrangement core, first draft
Better name, perhaps