Commented out some code for clarity.  Added debug for debugging purposes