todo updated and minor updates to model. FT getting further but not passing.