Updating builder to actually work