Basic changes made.  NOT WORKING YET.