RF: This is still not completely thought through (and doesn't work).

Taking it out for now.