Much rework on calc gradient, etc. Still need to poke my metadata in earlier.