Started porting to rbc (fn/var names)