partially updated comments (and repurposing of class).