refactor some more to encapsualte wrapped model / chain model code
clean up