spherical test cases almost working, WIP on disc code