Refactor
Refactor again
Fix R type
Fix another type R
More refactoring
Librarify
Refactor