Starting to add reactive.
More fixes, still lots to do.