WIP :-(
Meh
Revert "Meh"

This reverts commit 07d8cc67938ec8f7c2649b9856c1eec48e5551fd.
Better?
WIP2.