Reverted back commenting area to previous version for now. New version still needs work.