Implement RBFS
Change names
Merge branch 'rbfs'