WIP
Better config, docs, etc.