Cell Class changes, and Board Class upgrades