Work in progress

We still spend some brain juice on it.