Use stacks for cells instead of structures