Bug in null safety

Fix bugs in the null safety stuff

Update to null safety

Update to null safety

Use the clock package

To get the now time making tests easier to write

Switch to using clock for time

Using clock.now() so the time parts can be tested.

Fix issues with Android

Fix the double dispose issue.