Revert "Revert "had to make builders static""

This reverts commit 358ca859a473efdc4d87f79c2bac29be7212cd94.