Added stubs for light classes.  Cleaned up some unnecessary variables.