Getting ready for submission 2, commenting out things that are not ready but are necessary.