rf: first draft that includes cleanup