Changed Builder class to cut down on string manipulation, and take advantage of objects