Extending ModelFetch to class and instance methods

Moving coder into a support macro.  Still feels dirty
Cleaning up ModelFetch and some tests