more work towards ready for testing