started fixing FT and UT to bring them up to speed.  FT pass.  UT test_models pass
working on more FT now