Moved Cell Variable struct to MODULE_VARIABLES
Added reassignment statements for CELL_VARS
Merge branch 'Colby'