This code should be working now. We may want to go through a delete out
all the stuff that I commented out via // and <!-- --> markings.