[WIP] more configuration stuff