Need to add lots of unit tests around this class to test all of builder methods to ensure they work as expected.