Reverted some of the Lite changes.  Still bugs to work out.