antonhornquist refactor r_* libs