more cleanup and testing to get api chaining working from both directions (and not break anything); problems existed with Modelmap and new scaffolding in 2.3. Coming up with solution but making sure old functionality is still stable.