Not relevant code changes, just commentary on most classes