The five lines above...are these in-progress or should these comments be deleted?