Body is now responsible for cell calculations

Much faster, but less elegant - must clean up