Continued filling out classes