FIX: more usable as a library now, -> rtv