Remodeling. Lots of comments in the domain classes.