WIP: new configuration continued; might break something...