Hall calculations moved to store/hall