Merge pull request #2045 from sigmavirus24/csr-builder

Adds CSR Builder (Redux of #1927)