(Big commit) Implement auto-generated comments!