added setters, broke out location