Added the bulk of the old entropy guts, changing/updating a few things and adding comments.