Trying out some different option parsing code. Some code reorganization.
Starting a bit of reorganization of lighting code.