No longer using setters, removed empty string optional arguments, etc.