Some ugly code all around...

EXPERIMENTAL; not plugged in