RF: Things work now maybe. Needs testing