Refactoring the RSR module to be a bit more "standard" instead of a glomp of stuff