Commenting out and moving around some extraneous code (for now)