Converted everything to run on cells instead of positions