Getting some understanding of how the time works -making it right for NEP6.
Testing bror's version of things.
Merge with Bror's latest.
Turn on the NEP fish.
Merged Kates changes