Further work on getting this all tested.