Refactored builder into a better… builder!