wal

The above is seperate PR worthy, though.