Builder module functionality #931 ready for testing