Changed to suit the solar analysis; this needs to be generalised, and so this file should NOT be pulled back into master in its current state.