Moved cell calculation to model and some work on tools/animations